bit-test-array-fixes

===================================================================

Gbp-Pq: Name 32-bit-test-array-fixes.patch

diff --git a/src/lib/test-array.c b/src/lib/test-array.c
index d6bebbae348e6a92becae81c0ae18005289ee3da..2cf90deb6c83e9f66072a64c6e74ae46c636b9a5 100644 (file)
--- a/src/lib/test-array.c
+++ b/src/lib/test-array.c
@@ -461,7 +461,14 @@ enum fatal_test_state fatal_array(unsigned int stage)
 
                t_array_init(&arr, 2);
                array_push_back(&arr, value);
+               /* this test triggers different failures on 32- versus
+                * 64-bit architectures. It's a failure in both cases,
+                * so we just handle it... */
+#if SIZEOF_VOID_P == 4
+               test_expect_fatal_string("memory allocation overflow");
+#else
                test_expect_fatal_string("Buffer write out of range");
+#endif
                /* this is supposed to assert-crash before it even attempts to
                   access value */
                array_append(&arr, value, UINT_MAX);